home
***
CD-ROM
|
disk
|
FTP
|
other
***
search
/
Aminet 1 (Walnut Creek)
/
Aminet - June 1993 [Walnut Creek].iso
/
aminet
/
misc
/
unix
/
dnet_diffs.svr4
< prev
next >
Wrap
Text File
|
1992-12-15
|
6KB
|
242 lines
diff -cr ./client/Makefile /usr/local/src/dnet/unix/client/Makefile
*** ./client/Makefile Wed Sep 16 00:10:26 1992
--- /usr/local/src/dnet/unix/client/Makefile Wed Sep 16 00:43:28 1992
***************
*** 4,9 ****
--- 4,12 ----
# DNET (c)Copyright 1988, Matthew Dillon, All Rights Reserved.
#
+ CC=gcc
+ CFLAGS=-I/usr/local/bsd43include -O2
+ LIBS=-lbsd43
NETLIB = ../lib/dnetlib.o
BIN = ../bin
***************
*** 12,30 ****
$(BIN)/getfiles
$(BIN)/draw: draw.o
! cc draw.o $(NETLIB) -o $(BIN)/draw
$(BIN)/dsoc: dsoc.o
! cc dsoc.o $(NETLIB) -o $(BIN)/dsoc
$(BIN)/getfiles: getfiles.o
! cc getfiles.o $(NETLIB) -o $(BIN)/getfiles
$(BIN)/putfiles: putfiles.o
! cc putfiles.o $(NETLIB) -o $(BIN)/putfiles
$(BIN)/dprint: dprint.o
! cc dprint.o $(NETLIB) -o $(BIN)/dprint
clean:
rm -f *.o make.out
--- 15,33 ----
$(BIN)/getfiles
$(BIN)/draw: draw.o
! $(CC) draw.o $(NETLIB) -o $(BIN)/draw $(LIBS)
$(BIN)/dsoc: dsoc.o
! $(CC) dsoc.o $(NETLIB) -o $(BIN)/dsoc $(LIBS)
$(BIN)/getfiles: getfiles.o
! $(CC) getfiles.o $(NETLIB) -o $(BIN)/getfiles $(LIBS)
$(BIN)/putfiles: putfiles.o
! $(CC) putfiles.o $(NETLIB) -o $(BIN)/putfiles $(LIBS)
$(BIN)/dprint: dprint.o
! $(CC) dprint.o $(NETLIB) -o $(BIN)/dprint $(LIBS)
clean:
rm -f *.o make.out
diff -cr ./client/draw.c /usr/local/src/dnet/unix/client/draw.c
*** ./client/draw.c Wed Sep 16 00:10:47 1992
--- /usr/local/src/dnet/unix/client/draw.c Wed Sep 16 00:43:59 1992
***************
*** 15,20 ****
--- 15,21 ----
#include <sys/types.h>
#include <sys/ioctl.h>
+ #include <sys/ioctl_compat.h>
#include <stdio.h>
#include <sys/file.h>
#include <signal.h>
diff -cr ./dnet/Makefile /usr/local/src/dnet/unix/dnet/Makefile
*** ./dnet/Makefile Wed Sep 16 00:10:28 1992
--- /usr/local/src/dnet/unix/dnet/Makefile Wed Sep 16 00:37:18 1992
***************
*** 9,20 ****
# and then setenv DNETDIR ~/.DNET/ ... all clients and servers will
# use the enviroment variable to find/create the UNIX level sockets.
BIN = ../bin
OBJS = dnet.o control.o files.o globals.o net.o subs.o internal.o \
dataconv.o packet.o
$(BIN)/dnet: $(OBJS)
! cc $(OBJS) -o $(BIN)/dnet
clean:
rm -f *.o make.out
--- 9,24 ----
# and then setenv DNETDIR ~/.DNET/ ... all clients and servers will
# use the enviroment variable to find/create the UNIX level sockets.
+ CC=gcc
+ CFLAGS=-I/usr/local/bsd43include -O2
+ LIBS=-lbsd43
+
BIN = ../bin
OBJS = dnet.o control.o files.o globals.o net.o subs.o internal.o \
dataconv.o packet.o
$(BIN)/dnet: $(OBJS)
! $(CC) $(OBJS) -o $(BIN)/dnet $(LIBS)
clean:
rm -f *.o make.out
diff -cr ./dnet/internal.c /usr/local/src/dnet/unix/dnet/internal.c
*** ./dnet/internal.c Wed Sep 16 00:11:10 1992
--- /usr/local/src/dnet/unix/dnet/internal.c Wed Sep 16 00:40:28 1992
***************
*** 18,23 ****
--- 18,24 ----
#include <sys/resource.h>
#include <sys/uio.h>
#include <strings.h>
+ #include <sys/ioctl_compat.h>
extern char *getenv();
diff -cr ./dnet/net.c /usr/local/src/dnet/unix/dnet/net.c
*** ./dnet/net.c Wed Sep 16 00:10:50 1992
--- /usr/local/src/dnet/unix/dnet/net.c Wed Sep 16 00:41:30 1992
***************
*** 10,15 ****
--- 10,16 ----
#include "dnet.h"
#include <sys/stat.h>
+ #include <sys/ioctl_compat.h>
RcvInt()
{
***************
*** 33,40 ****
--- 34,44 ----
{
int async = 1;
+ #ifndef AMIX
+ /* don't... AT&T sockets lose their socket-nature if chmod'ed... */
fstat(0, &Stat);
fchmod(0, 0600);
+ #endif
/*
signal(SIGIO, RcvInt);
*/
***************
*** 58,64 ****
--- 62,70 ----
{
int async = 0;
+ #ifndef AMIX
fchmod(0, Stat.st_mode);
+ #endif
ioctl (0, FIONBIO, &async);
/*
ioctl (0, FIOASYNC, &async);
diff -cr ./lib/Makefile /usr/local/src/dnet/unix/lib/Makefile
*** ./lib/Makefile Wed Sep 16 00:10:33 1992
--- /usr/local/src/dnet/unix/lib/Makefile Wed Sep 16 00:34:46 1992
***************
*** 1,5 ****
-
dnetlib.o : dnetlib.c
- cc -c dnetlib.c
--- 1,5 ----
+ CC=gcc
+ CFLAGS=-I/usr/local/bsd43include -O2 -c
dnetlib.o : dnetlib.c
diff -cr ./server/Makefile /usr/local/src/dnet/unix/server/Makefile
*** ./server/Makefile Wed Sep 16 00:10:34 1992
--- /usr/local/src/dnet/unix/server/Makefile Wed Sep 16 00:46:41 1992
***************
*** 4,9 ****
--- 4,12 ----
#
# DNET (c)Copyright 1988, Matthew Dillon, All Rights Reserved
+ CC=gcc
+ CFLAGS=-I/usr/local/bsd43include -O2
+ LIBS=-lbsd43
NETLIB = ../lib/dnetlib.o
BIN = ../bin
***************
*** 12,37 ****
$(BIN)/sloadav $(BIN)/sgcopy $(BIN)/snfs
$(NETLIB) : ../lib/dnetlib.c
! cc -c ../lib/dnetlib.c
mv dnetlib.o ../lib
$(BIN)/snfs: snfs.o
! cc snfs.o $(NETLIB) -o $(BIN)/snfs
$(BIN)/scopy: scopy.o
! cc scopy.o $(NETLIB) -o $(BIN)/scopy
$(BIN)/sgcopy: sgcopy.o
! cc sgcopy.o $(NETLIB) -o $(BIN)/sgcopy
$(BIN)/snfs: snfs.o
! cc snfs.o $(NETLIB) -o $(BIN)/snfs
$(BIN)/sshell: sshell.o
! cc sshell.o $(NETLIB) -o $(BIN)/sshell
$(BIN)/sloadav: sloadav.o
! cc sloadav.o $(NETLIB) -o $(BIN)/sloadav
clean:
rm -f *.o make.out
--- 15,40 ----
$(BIN)/sloadav $(BIN)/sgcopy $(BIN)/snfs
$(NETLIB) : ../lib/dnetlib.c
! $(CC) $(CFLAGS) -c ../lib/dnetlib.c
mv dnetlib.o ../lib
$(BIN)/snfs: snfs.o
! $(CC) snfs.o $(NETLIB) -o $(BIN)/snfs $(LIBS)
$(BIN)/scopy: scopy.o
! $(CC) scopy.o $(NETLIB) -o $(BIN)/scopy $(LIBS)
$(BIN)/sgcopy: sgcopy.o
! $(CC) sgcopy.o $(NETLIB) -o $(BIN)/sgcopy $(LIBS)
$(BIN)/snfs: snfs.o
! $(CC) snfs.o $(NETLIB) -o $(BIN)/snfs $(LIBS)
$(BIN)/sshell: sshell.o
! $(CC) sshell.o $(NETLIB) -o $(BIN)/sshell $(LIBS)
$(BIN)/sloadav: sloadav.o
! $(CC) sloadav.o $(NETLIB) -o $(BIN)/sloadav $(LIBS)
clean:
rm -f *.o make.out